From 016ba7009baa3683d7572d923358cf70cee29b63 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 14 Sep 2018 14:49:32 +0100 Subject: [PATCH] d/copyright: Reduce warnings by using standalone license paragraphs --- debian/copyright | 88 ++++++------------------------------------------ 1 file changed, 11 insertions(+), 77 deletions(-) diff --git a/debian/copyright b/debian/copyright index dd3b281d33..c0a1266596 100644 --- a/debian/copyright +++ b/debian/copyright @@ -90,6 +90,8 @@ Copyright: Copyright (C) 1986, 1987, 1998 The Open Group Copyright (C) Christian Kellner Copyright (C) David Zeuthen Copyright (C) Javier Jardón +License: LGPL-2+ + License: LGPL-2+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the @@ -158,6 +160,8 @@ Copyright: Copyright (C) 2010 Christian Dywan Copyright (C) 2010 Christian Persch Copyright (C) 2018 Benjamin Otte Copyright (C) 2011-2018 Red Hat Inc. +License: LGPL-2.1+ + License: LGPL-2.1+ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the @@ -506,22 +510,6 @@ Copyright: Copyright (C) 1998-2010 The Free Software Foundation, Inc. Copyright (C) 2008, 2009 Funda Wang Copyright (C) 2009, 2010 Hinker License: LGPL-2+ - This library is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - . - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - for more details. - . - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA. - . - See /usr/share/common-licenses/LGPL-2 on your debian system. Files: gtk/gtk-text-input.c @@ -533,7 +521,7 @@ License: X11R5-permissive Files: gdk/win32/wintab.h gdk/win32/pktdef.h Copyright: Copyright (C) 1991-1998 LCS/Telegraphics -License: other +License: lcs-telegraphics-permissive The text and information contained in this file may be freely used, copied, or distributed without compensation or licensing restrictions. @@ -546,7 +534,9 @@ Files: gtk/gtktexttag.* Copyright: Copyright (C) 1992-1994 The Regents of the University of California. Copyright (C) 1994-1997 Sun Microsystems, Inc. Copyright (C) 2000 Red Hat, Inc. -License: other +License: sun-permissive + +License: sun-permissive This software is copyrighted by the Regents of the University of California, Sun Microsystems, Inc., and other parties. The following terms apply to all files associated with the software @@ -592,65 +582,7 @@ Files: gtk/gtktextdisplay.* Copyright: Copyright (C) 1992-1994 The Regents of the University of California. Copyright (C) 1994-1997 Sun Microsystems, Inc. Copyright (C) 2000 Red Hat, Inc. -License: LGPL-2+ or other - This software is copyrighted by the Regents of the University of - California, Sun Microsystems, Inc., and other parties. The - following terms apply to all files associated with the software - unless explicitly disclaimed in individual files. - . - The authors hereby grant permission to use, copy, modify, - distribute, and license this software and its documentation for any - purpose, provided that existing copyright notices are retained in - all copies and that this notice is included verbatim in any - distributions. No written agreement, license, or royalty fee is - required for any of the authorized uses. Modifications to this - software may be copyrighted by their authors and need not follow - the licensing terms described here, provided that the new terms are - clearly indicated on the first page of each file where they apply. - . - IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY - PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL - DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, - OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED - OF THE POSSIBILITY OF SUCH DAMAGE. - . - THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND - NON-INFRINGEMENT. THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, - AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION TO PROVIDE - MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - . - GOVERNMENT USE: If you are acquiring this software on behalf of the - U.S. government, the Government shall have only "Restricted Rights" - in the software and related documentation as defined in the Federal - Acquisition Regulations (FARs) in Clause 52.227.19 (c) (2). If you - are acquiring the software on behalf of the Department of Defense, - the software shall be classified as "Commercial Computer Software" - and the Government shall have only "Restricted Rights" as defined - in Clause 252.227-7013 (c) (1) of DFARs. Notwithstanding the - foregoing, the authors grant the U.S. Government and others acting - in its behalf permission to use and distribute the software in - accordance with the terms specified in this license. - . - or - . - This library is free software; you can redistribute it and/or modify it - under the terms of the GNU Lesser General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - . - This library is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License - for more details. - . - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the - Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - 02110-1301 USA. - . - See /usr/share/common-licenses/LGPL-2 on your debian system. +License: LGPL-2+ or sun-permissive Files: debian/missing-sources/zlib.js-0.1.6 @@ -687,6 +619,8 @@ License: Expat Files: debian/missing-sources/zlib.js-0.1.6/closure-primitives Copyright: © 2006-2010 The Closure Library Authors +License: Apache-2.0 + License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. -- 2.30.2